Formatting etc.

Syncing again the two forks. After a bit of merging-mess :)