Add more to be added features
More tweaks for xml output
Add some notes