Improved Rakefile and modified jem based oon feedback from @halostatue