Cleanup and minor bugfixes. Removed filler call from positionMasters(), going to do it in a async way (and throttle it)