Client now handles character rejections
Remeved the commented BUGFIX tags