scons issues fixed, code style fixed