fixing reported issues