Update dependencies & small cleanup (#979)* update deps* cleanup* use map for object defs* small improvements (commit: aadcf29)