fixes from connie