fleshed some things out