small fixes & sync