builder fixes, and cfetch.c code cleanup.