2/6/14 afternoon heng

bug fixes