Corrected media for #313
Removed stateselect for p in water. For #313
Added final for #313