checking out compare fixes from master