Update to conform to APIv2.0r13, some superficial touchups