Added level 2 + minor fixes