Minor tweaks & clang++ support & fixes.