Added demo and fixed some stuff