fixes and improves for spectrum