Add various stuff.

Tests: