FIX: Fix examples

Closes #524.
Closes #522.

Ready for review/merge.
So this change should be reverted?