Various fixes.  There are some additional external perl modules to add which I'll fix up.