in work
fixed some little bugs