fixes and deletion