fixed minor stuff
Merge branch 'refs/heads/MoachMod'