fix bug index remove, +some little fix