Fixed bug 32 and worked around bug 33, relating to bioenergy oversupply