Some model fixes, broken tests (showing an error with model timings when eating pills) and something working again.