merge chris' updates to fixed channel module with my own