more Rakefile mods