Cleaned up code (and file set).
Added various user interaction possibilities.