Level End + few corrections