some little fixes, added new demo