lots of reform updates/fixes