plot grade 1
some little fixes, and cleanup