String uniformity, some helper fixes, form fixes