refined calculations a bit; fixed bugs; added ev;