handle more capacity calculation issues and expose more values for monitoring