some surface-level changes