week3task5 - and small fixes