Added component base, fixed comments