Bug fixes and early projectile work