Fixed demo and updated settings