fixes after review

are you absolutely sure about this change?