- Fix erroneous x.Empty properties to generate appropriate content
- add vector