some other fixes and shit