Added fancy type instances to FreeHomTrainer
Fixed bugs in conditioning code