added new trim strings and update some of table