fixes after nice comments