Improvements to various classes