other new stuff that makes more sence

fixed some spacing and bracing issues