minor updates

update with some bugs need some solution