bug and new functionality update

bug and new functionality update