Further Fixes for input
Merge remote-tracking branch 'origin/development' into Edwin
More projectile changes