removed commas and some lingering function names in error text