some little demo fixes