changing up rake tasks and fix errors