Both things fixed. I'm pretty bummed out about the pre-commit hook betraying me