various tweaks, I kinda forgot which cuz racing to the end