updates+from+chris

updates from chris