cleanup
cleanup
butch spec and cuke fixes