improved Rakefile