Tweaks and fixes to week 1