~tm85/bectes 

round 3, some changes too

batch 2 + tweak some

init + first batch