Tweaks and fixes and holey jesus I hope this works