few more small tweaks on lesson loading