Fixing up a lot of half done sections