New example; Bug fixes.
Great to see this many fixes, it's always good when construct gets more robust