* Level 1 bugs fixed