Fixing rake and some other issues with this code being a little stagnant