Fixed map stuff and added header