added conjugate; code cleanup