Reworked gemspec etc.