Did some refactoring, bug in critters