Added xml generator, error processing and some UI improvements