refactor highlighting and fix man page