stats and bugs
merging