Fixes, improvements, gemspec issues