wip leftover changes from the weekend