fix a myriad of broken things