This it the real initial commit.
Cleanup and fixes