thesis work, minor sample code updates