bug fixes and updates