Added my map stuff and tidied up a little bit.