fixed a bug plus removed all unnessary xml tags so as to be automatically generated