Level 2

Added level 2 and fixed some bugs in level 3.