added html support
improvements to json modeling