Fixed --sync
Fixed sync
Fixed reindexing
CS
Added constants
First step to constants
Added constant merging