Lots of cleanup and bug fixes
Added a sync tree setting
0.7.0