Small fixes and better transitions.