add gerry's suggestions and rspec files