General improvments + 'sync' option