updates to Rakefile and others
Rakefile cleanup