Feat: finetune entries and totals