this fixes issues that the new stuff commit left out fixing

fixed spacing and bracing issues has no conflics now :smile: