Refactors and updates

Xiaoyu Weirequested to merge
updates into main

Some updates needed due to changes in sumpy

Merge request reports