Fixed typos
Small docblock fixes

Signed-off-by: Dries Vints <dries.vints@gmail.com>
Use makeListener for wildcards.
merge 4.0 branch to master. fix conflicts.