Further fixing of power and spectrum
and another fix for spectrum because I can