bug fixes
Cleanup for v1.0