Revert "Removed invalid comments"

This reverts commit 29b9d921f8640d6d07ddc0804cc90f1a612accaa.
Huge change in structured code... hopefully it just works