added T1_start
plus minor cleanup
minor: renamed d2 and added additional debug