Bug fix (delete in sorted table) + Minor changes