major updates, mostly to clean up publications