fwilpull?

misc. fixes / cleanup.