Squashed 'wicker/' changes from b2e18ee..165d15b

165d15b minor bugfixes/typos

git-subtree-dir: wicker
git-subtree-split: 165d15b9408eedc2c45b8dce6fe036cb3c3d24cb
wicker merge
some bugfixes