changes to fix issues, 621 and 622
11 files changed