fixed reported issues