Some more minor work done.