few bugs correct