Make it work, and add small usability touches