correct few bugs