Tweaking builder.py to be more useful. .js changes were to test builder.py