Updated the channelsetup structs.
Tidied up some code.
Tidying up.