fixed all and incomplete bug