test bug fixing and more