Various small update.

Tests: