fixes based on comments