Squashed 'wicker/' changes from 0e050f9..dbbbea0

dbbbea0 some more small tweaks
3add307 small improvements

git-subtree-dir: wicker
git-subtree-split: dbbbea0aa031da8b86ba02bbdefbcc9f3e9a1581
Some wicker tweaks.