Committed some bug fixes in Player and Map