fixing up setup and rake scripts