add some const (lots to do)