FIX: Fix examples

Closes #524.
Closes #522.

Ready for review/merge.
Not 100% sure this is correct, not sure what the original intent was for passing it on as a `Function`...