100 more fixes, 1400 remaining