bug fixing
some comments