finished with a couple bugs