Various changes, fix gemspec