Improved version check on client. Improved handling xml. Added TODO
simon.