added types, fixed parser
need to fix querying.