Version 1.2

Merged with Geirs 1.2 code. Also fixed projectile code.