mark`s report bug fixes