Too many fixes to describe

indescribable.