Fix bugs with lib, make it easier to add outputs
Housekeeping, get rid of more of the old code
Make the comball fields actually work