some fixes and added week 3