More escaping and validtion.