Add examine screen & minor correction