Updated/added docblock comments