some week 1 fixes