Stats and crystal eating / Fixes & Cleaning