MacroNavigator 1.0

more fixes, more features, more tidy up