some bugfixes - version 0.6.4