Add stepping, fix breakpoints to show line, etc.