improved rake tasks