More reformatting, more annotations

And "zis is only ze beginning"...