Various fixes and added guess to curve fit in week2