Fix a couple bugs and add the ability to note which objects contain Javascript