fixes on lesson by A.M.