Working deletion and other tweaks