Demo and minor updates