Work on #2 and some minor clean-up.