fixes based on comment