Setting up demo
And little fixes here and there