Initial commit to public repository

Cleanup and some fixes applied.