Cleanup, esp. spectrum corrections