fixing reported bugs