Day 50: More clean up

Still working on tying some loose ends. Will be for a few more days.