updates and changes to Rakefile