Continued adjustments to get library back in sync

ARGH - this thing is really struggling to commit...