fixed problems with levels being reset
merge