Went through, making corrections and cleaning up some systems