Finishing and cleaning up builder.c
Finishing builder plus a few other things...