30/12/13 afternoon heng

fix bugs for 26, 13, 28, 22