Add Rakefile, minor changes