Fixed bugs. Demo is fully functional.
One workaround which still needs fixing.