Miscellaneous changes to improve presentation