M3 0.4

Fixes

Minor changes