reflect format changes + misc fixes