changed default channel code and tidied up