fixes from Kirk 2