master merge from faculty

Adding bug fixes from today. Merged from faculty branch.