Working on comments, fixing some predicates