Some fixes that make my system work better

You also said in a comment that you tried to make the spacing consistent, but it really doesn't seem consistent at all.