Alex comments fixes