bug fixes in pull