Bug fixes and changes on blinding, etc.