removed 2 bugs to start integration. - week 36, 3rd sept.