Fixed some transition problems.