Fix a silly issue, fixes platforms and a few others.

Also formatting