Pre Merge with TinyBCT fork

During the development of TinyBCT we discovered a couple of bugs or added a few features to analysis net