Bug corrections and Ojson export modification