just a couple bugs left