fix rakefile and so forth