On second though, hold off on fixing these. I'm about to tear up and refactor these functions in a big way, so don't worry about it.