updated comments; added solution for 1.21
updated comments