Add multiarch support.  Add a few changes from futureproof2 so I could inject