Small fixes. Starting working on demo