fixups and way too much dev work