Removed a bunch more instances of dm.curr_lvl