Mistakes apparently fixed...