Cleaning up a little more, fixing transitions.