tidyup and added demo files