added scaladoc to Future and Task and minor cleanup