Touchup to HW03

Clean things up a little, getting close to being done, not quite there
yet.