Some fixes
Finished level 2, and made level 3