incorporate some older rakefile mods