Finished word storm stuff, cleaned up a few other sections