fixed reported bugs