improve more rake tasks