more stuff + constify