some little bugs were fixed