Fixed several bugs, added Not Implemented messages