Better display; fix miscellaneous bugs