Do not use Poisson errors. Instead implement bootstrapped errors and turn them off
Minor fixes and tweaks