some minor improvements to embargo