Add start of support for scons, but doesn't link yet. Some minor other corrections.