fixes from live testing