Cleaning up old commented code, touching up user interface, adding error
checking.