more updates and removal of escaping and quoting