Added make-obj stuff, terms can now be inside maps, cleaned up query.clj a bit
Fixed small mistakes on handling args