made more stuff const