Version bump to 0.5.2
Bunch of cleanup