Minor changes, committing so I can test Andre's changes for the replica package