change a few bugs