~tm85/bectes

ref: 6dc87cb76ef099455be156d3f31fd354dceac1fb bectes/kra d--------- 
batch 2 + tweak some