bug fixing & testing