rewrites, fixes and syncs