Updating rake task

And other things