fixed some nonconj issues