additional fixes after comments HJ