bug fixing
bugs fixed