[fix] fixes and cleanup for release 1.0