Added some stats and moved some constants.