conducted some tests and fixed bugs