Highlights bugfixes + beginning remixing.

(buggy)