Mainly typing corrections.
requested review from @siw019
assigned to @siw019
merged
mentioned in commit 21f6a516