Fixed some small issues, fixed errors in expected values, added percent counter for expected values