fixes after Geremy's feedback 0605