some small changes; refs