fixes based on answers