improved rakefile