More changes to structure

map more options, changes to menu as well as improvements to save.