syntax fixes
Register client, callbacks