Answers and some final changes