made various changes to fix various bug reports