minor fixes, nonconj passes basic test