Hometask 2.4, 2.5, 2.6.

With fixes