testing and bug fixing