Add answers and fix broken advice and tests