various changes for version 1.0