Few fixs
Bump
Updated the demo a bit