Fix hints and add stats commands