a few bugs remove