Some updates for the latest rust along with a cleanup or two

I had to hold myself back on the cleanups, your code is quite annoying to read with all the random dead code strewn about and the mixed spaces and tabs.