Cleanup and fixes for 1.0.0 Release