UUID, Session Token, some bug fixes