updated to newest parser version
added additional predicate support
some cleaning up