changed house and channel defaults and tidied code