UPDATED: version bumped to 1.2.0 and further cleanups