various etudes fixes