Revert "various improvements / fixes"

Reverts jonbrown21/Horizontal-Graph-Controller#1