Fixed more bugs in level 6