Added spawn grace timer and more map parsing