bug fixing

fixed issues