assorted changes to bring up to date.  some things left unimplemented