More work on coref
updated