Fixed Spring files so they compile. A lot of code cleaning, sorrygit status I was getting stressed about some of the messyness. Also, I don't think we should use pointers as much as we are, they are evil.