Add force full sync option

+ lots of bug fixes/testing