small fixes
Starting work on assignment