Finished fixing blCalc (hopefully)

Some cleanup is still in order.