Add highlighting support and other minor improvements.