Make some fixed to projectiles and a couple other things.
Merge origin/master