Fix category
Add comments
Add Stat