Conventions & Compilation

I fixed up some of the places that don't match convention. I also found some compilation errors and fixed those too. Entirely up to you if you want to accept this or not, but I'll be happy to continue doing this as you go along - you use whatever is easiest for you, and then I clear it up a bit after.

I didn't rename anything that wasn't an error - I just adjusted to fit convention.