Fix lots of things accross all data entry points, including JS and grammer