tracked new schema, clean up some comments