Added proper demo folder + new todo + various improvements