Updated Rakefile and some smaller changes