astyanax working at last (some improvements remain tbd)