Faster transitions, work around weird velocity bug