Added name attribute to new dictionary type
merged
rearrange comments so real code is at the top. also fix the build for OSX because scons is jank