Added some simple commitment reporting to the resource model, cleaned up others