Merged with joystick controls for bonus round
Fixed a few mistakes from the merge