More cleaning and fixing layout
Getting ready for 1.0!!!

Almost ready to tag this, and to release 1.0
Fixes #1