tweaks
merge remaining comments in extension section