'add' and 'del' switches, small fixes