Included Stats and minor bug fixes