made a few things const that should have been