Bacon fixes and finetuning