Fixed reports bug and some improvements