Version 0.6.4

Many fixes and improvements.