Reformatted questions

Changed name an location of the answers to the questions