Add demo and tidy some things