week 3

part of week 3 and some week 2 corrections