Add data
Several parsing and printing updates