expand some things out