Improvements to make it easier to use.