fixed some transition stuff