had a few bugs