upgrade to 0.6.1 - minor bugfixes and code-cleanings