quick changes, cleanup and version 1.1.1