improvements to SConstruct