27/12/13 afternoon heng

fix bugs 26, 13, 28