fixed some smooth transition issues