Added support for 1024 maps, rearranged some code, added some timers