bug and reporting fixes