improved comments to match new protocol
improved formatting yet again