0.6.1 - fix a few bugs