add delete support
listen fixes