fixed some of the spacing and things