a few bugs change