removing extra solutions and modifying question numbers