Usability improvements. Began writing parser.