Improve and fix replies