bug fixes and updating