Fixed channel model, refactored some things