moving around some stuff; merging techreport into paper