It's not quite finished, but, multiple fixes.