JIN-9 and some little fixes