fixed all things