bug fixes started