fixes and updates while I check what I broke