Add support for events callback and multi-user

-- Add events callback, and support for add-user and remove-user events
-- Minor cleanup