Fixed single character quote not found errors and fixed new function returns.