convert ng- tags to x-ng- to make them valid html
small non-funct changes prior to merging to branch