fix the positioning for replies
fix stubs