fixes based on pr comments