add consts in
oops... more const changes