Adding some usability improvements.