- added some string manipulation