Major bugfixes... and better / working example