several improvements on Rakefile