16/5 evening heng

bug fixes