Commented few bugged lines