Bug report feature/improvements