improved code pickers, self-deleting ‘null’ sections