mostly styles changes and a 1-2 functional changes

I didn't run this code after making these changes, FYI