Fixed a couple of minor issues, but uncovered a few more issues.
The mixer needs more of a re-write. :(