cleanup from merge with local - add better errors
link to youtube item