Usability fixes, bumps major version to 2