Minor task fixes. Improved  documentation