lots of formatting tweaks
improved horizon display
OrderedDict works better this way