code improvements, tests, merged pull requests