fixes for demo, addition of API REST controller files