Improved handling of user input; code cleanups
Version 0.6.8