Add user stats and some small improvements and fixes