updating fork to cornguo's latest base