More usability improvements and cleanup.