update code, remove redundancies, and differentiate between synced and non-synced markers