version 0.6.4

some bugfixes, renames, etc.