final updates

still needs some minor fixes, but in general its done for 0.6.4