some improvement

Mod note: Re-timed with yt-frame timer, starting at 1:21.50 and ending at 9:26.166 for a total time of 5m04s667ms