Improved some usability.