bug fixes with reporting