some additional changes to complete comments in last commit