#478, fix sync and other minor fixes