Updated progress on rules & login