Create cleanups

ported the cleanup changes from #20 into the create branch. please merge into the create branch and then together with the rest into master.