Trying to fix several levels advances
Several changes