Added additional comments to various components