made changes reported in issues