Random bug fixes, advancing the channels, unit tests, seperating contacts not just...