Added two more functions and fixed choking on escaped quotes