minor cleanup
getting all tests working