fixes after feedback