Changed map, added countdown, few fixes and deleted some comments