support for entity type styling. better errors. better brackets. minor tweaks