More fixes on conversations
Major code refinement