fixes based on comments (squash please)