Fixed/commented all code errors