fixed all, hopefully