updated rakefile and did some more cleanup