All known errors seemingly solved. Some more testing necessary, but looking good.