endless formatting fixes
and more