Debugged Wk2 Goal3

Various changes to example 5.