Update version to 1.1-dev
Minor fixes for comments
Clean up imports