Flesh out property specs and fix some bugs found in doing so.