comments for issues #1844 and #2125, added some warnings, fixed #2034