added usability improvements.