mege w local repo... mainly formatting and logging, and other misc non-behavior altering changes