Several stabilizing fixes. not there yet....