more updates for const and refs