highlighted state, bug fixes