Disaggregation Improved, Small Bugs Fixed