Fixes, tests working but plenty does not.