Adjusted composer for faker extension.
Fixes #1748: code cleanup.
doc fix.
minor fixes.