minor fixes to 5, added stubs for 6
added hw3