Various fixes to task #3 - seems to work now