cleanup and fix rakefile