Fixed some of my own mistakes