#4 fixes for unbundle
#9 slowness of transfers to tdlc
#9 tsting buffer options
merge development