Mod update 0.6.4

Fixes and tweaks