Updated diss paper to in press