Remove redundant double locks
Check for null channel on accept()
Add settings UI