Add dozer + minor improvements