fix bugs
update comments