2nd Sync

Various Bug Fixes