Very good loadtimes
various clean up
Merge pull request #97 from duiker2/master

load times as good as they will get