Many changes; ref's working; cond working