incorporate suggested fixes