[feature23] some fixes