Fixed channels bug; some cleanup