clean up method names; add missing call-backs for chat