Cleaned up dependencies, added spectrum back in