15/10 afternoon heng

bug fixes