Merged more. More fixes.