Bugfixes for HerSampleBootstrapper
Turn loops up a bit
Update TODO