Fixing spacing and minor things