bug fixes in