Editing and much cleanup
Update war file