Tighten up sync a little, fix some off-by-one's