partial commit
misc errors corrected, new version