bug fixing & changes