add new channels
add a few ignores and tidy up