added some fixes to predicate generation
tinkering with parsing