Some fixes, not totally operational yet...