channel fixes & schema & gateway first version