tidy up and ideas
walking all over the code
xml
xml
xml hassled