Some bug fixes and updated war file