Rakefile & other changes