Delete key and minor bugfix