Module Cleanup

Cleaned up outstanding issues in 0.2 release.