Rearranged/commented some things.