minor formatting and JSON changes