DND started + small fixes