bug fixes to previous merge/push