Better commentary, slightly nicer display routines.