Assignment 5 fixes - too tired to fix syntax - will wait for answers