Update docblocks, consistency/missing types, etc