Enhancements to the ICPRB Potomac River Spill Model