added exceptions and test
added salinity variables
added more variables