fix a couple of TODOs, remove LabelStyle for now since we don't have any support in the renderers as yet