clean-up boltztrap further according to Shyue's TODOs and fix a bug