Added vendor prefixes for necessary fields. Small fixes.