Bunch of small things
Rakefile bugfix