Just a few bugs left