Some usability improvements.