Adding block level trickle functionality, plus further updates