And cleaned the Rakefile up a bit more.