Latest BlackOps improvements

I've reviewed the latest changes and they look good.