Fixed the last few bugs that I could redily find. This will be v0.8