Extended AST. Fixed all warnings and conflicts in *.cpp and language