fixed some of my own errors