Tweaks
Fixed imports
hotfix: initialize PSO and fix center_of_mass stuff