0.6.4

Mostly Light Test and lots of tweaks and minor additions.