fixed a couple of downstream bugs
morphology refactoring passes test