- update some stuff to reflect the current situation

Reported by:	Dave Lawrence <tale@dd.org>