Final updates to 0.6.4

Thre are still fixes to be done, described in todo.txt