fix(*): address bcwaldon's thingies