more edits
bringing things up to date
Merging
Fixed the clock sync. problem