Jan 22, fix bugs