made some classes not celluloid
cleaned up handyman specs