Update with our progress and make some cosmetic adjustments.
Submitted by: "Sergey A.Osokin" <osa@FreeBSD.org.ru>