Small final touches before creating very dirty dirty release for some
practival use.