syntax fixes to State class setup
taking advantage of new bulk endpoints