some more changes, map/reduce, functions, collections ect..