Added level 8, fixes