Update to version 4

Lot of whitespace changes from them. Some other misc stuff. Was debugging something else and went to update to see if there was anything related.