fix output
Move back xml generating functions
Update README
Missing comments