Simplified Rakefile, fixed more issues