Minor changes and added new disease model methods