updates
some updates to ease replication attempts