changes and fixing the make script for all predicates
Oh boy, 23 compiler errors! Type fun tonight.