Fixing spacing and other misc things