Expose more info about memory usage.  Fix double-counting of some memory