Whitespace mostly, and fix storage of token by putting it in the session in more places.