comment out some code, which is not functional yet, and fixed some code,
that throwed errors