fix answers and comments