Added Input controlls
Tweaked Input and Main