Line cleanup on connect and some channel work