nvc
assorted changes