Component correction
+ js comments