lots of changes

discharg,admittances,blah blah blah