Finishing 8, and fixing a couple of problems