more fixes after remarks