More features and a callback bug fix
More features and a callback bug fix