Bug fixes a stats