Incorporated both players and fixed level select movement
merged with master