updated bug fixes