Spacing and error fixes