Added separate controls for both players and some other fixes