Comma problem fix + initial sync