Many, many fixes, still much more to be fixed...