fixes based on comment feedback