Adding 'comments' and 'disabling' functionality in blocks

Change-Id: I77c6f5190e17cc8725e6cd770e94cb61e05c23bd