Some fixes done, many still to do.