Added more features into stats, bugfixes