Updates to highlighting, etc.