Fixed all of the comments up, replaced some variable types with ones that conformed
to the rest of the code (Even thought they meant essentially the same thing)