Few changes, lap showing and some tweaks