examle and some little fixes