and here are the rest of the fixes.