Olymp demo + small errors corrected