Better controls. Shoot keys work again
Merge branch 'feature'