Fixing bugs, mostly w/ channel names and fs names