cleaned up comments; enforced json except where explicitly noted