fixing some bugs, tictak demo works