Back to no mac
Create directories for channels
Fixed several bugs
Merge branch nomac