more updates; incorporated C. Paus's changes