updates & formatting