fixes + rake tasks