more scrimps and scrapes
inexplicable merge conflict
fix formatting issues