fixed compiling errors, damn comments