Bug Fixes

Makes #246 not hang the browser (doesn't fix correctness)

Also fixes the "synonyms of properties" issue that a bunch of people ran into.