Cleanup

working on laptop
Work on web
Clean up some xml read/writes