fixes for assignment3