Correction + Changed questions

Professor changed some questions and found mistakes in code.