[new] fix some stuff