Minor code fixes, some internal docs
Uncomment a few interesting lines to see what..

will happen. Maybe this will fix PONG in standalone?