added count(*) support
added and/or expression
Added draft builtin aggregator functions