fix spacing and such