VP-152 minor changes, updated docblocks