fixed 1 == 2 error, and added in yes/no and state total rows