Demos remake and small fixes