update Rakefile; minor changes;