Updates
First batch of cleanups
More code cleanup
Partial update of the readme