resolved spacing and more things