fixed honey issue, no discontinuities, no starvation

Still doesn't quite match up with Wanyi's model, but very close