delete and other fixes