Added the ox branch tolerant and added some documentation