first round of bug fixes
change requests