many updates

bug fixing