bugfixes
~ minor bugfix
Merge pull request #65 from inexplicable/cluster3

minor bugfixes